Skip to content

test: Use beiboot on fedora-coreos#22923

Draft
allisonkarlitskaya wants to merge 3 commits intocockpit-project:mainfrom
allisonkarlitskaya:beiboot-fcos
Draft

test: Use beiboot on fedora-coreos#22923
allisonkarlitskaya wants to merge 3 commits intocockpit-project:mainfrom
allisonkarlitskaya:beiboot-fcos

Conversation

@allisonkarlitskaya
Copy link
Member

@allisonkarlitskaya allisonkarlitskaya commented Feb 25, 2026 •
edited
Loading 

Our current fedora-coreos test setup overlays the bridge and the plugins
on the host and then additionally installs the various RPMs into a
container.  This is more or less what you needed to do in the
pre-beiboot world, but the container on its own has been sufficient for
quite some time.

Let's get rid of the "host" install component and just use the container
straight-up, which is what we expect our users to be doing anyway.

@allisonkarlitskaya allisonkarlitskaya added the no-test For doc/workflow changes, or experiments which don't need a full CI run, label Feb 25, 2026
@allisonkarlitskaya allisonkarlitskaya mentioned this pull request Feb 25, 2026
Merged
2 tasks
@allisonkarlitskaya allisonkarlitskaya marked this pull request as ready for review February 25, 2026 09:24
@martinpitt martinpitt changed the title yolo: beiboot fcos test: Use beiboot on fedora-coreos Feb 25, 2026
martinpitt
martinpitt previously approved these changes Feb 25, 2026
View reviewed changes
Copy link
Member

@martinpitt martinpitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay!

@martinpitt martinpitt dismissed their stale review February 25, 2026 09:29

breaks rhel-8-10

martinpitt
martinpitt reviewed Feb 25, 2026
View reviewed changes
@allisonkarlitskaya
test: Use beiboot on fedora-coreos
c7a8b28 
Our current fedora-coreos test setup overlays the bridge and the plugins
on the host and then additionally installs the various RPMs into a
container.  This is more or less what you needed to do in the
pre-beiboot world, but the container on its own has been sufficient for
quite some time.

Let's get rid of the "host" rpm-ostree install component and just use
the container straight-up, which is what we expect our users to be doing
anyway.

We keep the "podman container runlabel INSTALL" from the end of that
script as a separate `--run-command` in `image-prepare`: we still want
to test this stuff in privileged mode (vs. the rhel/ws-container
scenarios which test an unprivileged container).
@martinpitt
Copy link
Member

martinpitt commented Feb 25, 2026

My suggestion: in the first run, just make skipOstree do what skipWsContainer does (1-line copy&paste change), run the tests, and we look at the fallout. For the real fix we need to replace most @skipOstree with @skipWsContainer`. If we are lucky, it's "all of them", and we don't even need skipOstree any more?

@allisonkarlitskaya
Copy link
Member Author

allisonkarlitskaya commented Feb 25, 2026

My suggestion: in the first run, just make skipOstree do what skipWsContainer does (1-line copy&paste change), run the tests, and we look at the fallout. For the real fix we need to replace most @skipOstree with @skipWsContainer`. If we are lucky, it's "all of them", and we don't even need skipOstree any more?

The two functions are already functionally equivalent because isBeiboot() will always be False here because TEST_SCENARIO doesn't contain ws-container. I modified skipBeiboot() instead to also check ostree images. Let's see how far that gets us.

allisonkarlitskaya added a commit to allisonkarlitskaya/cockpit that referenced this pull request Mar 3, 2026
@allisonkarlitskaya
test: re-merge {ws-container → ostree}.install
2dabe56 
This is a partial/"in spirit" revert of 64ec91c ("test: Split
ostree and cockpit/ws install scripts").  This introduces a bunch of
duplicate code (since it keeps the ws-container.install script as well)
but the next commit will start modifying that code in a way that's not
currently compatible with fedora-coreos.  We'll fix that up in cockpit-project#22923.
@allisonkarlitskaya allisonkarlitskaya marked this pull request as draft March 3, 2026 08:18
allisonkarlitskaya added a commit that referenced this pull request Mar 3, 2026
@allisonkarlitskaya
test: re-merge {ws-container → ostree}.install
799fae5 
This is a partial/"in spirit" revert of 64ec91c ("test: Split
ostree and cockpit/ws install scripts").  This introduces a bunch of
duplicate code (since it keeps the ws-container.install script as well)
but the next commit will start modifying that code in a way that's not
currently compatible with fedora-coreos.  We'll fix that up in #22923.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@martinpitt martinpitt martinpitt left review comments

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

no-test For doc/workflow changes, or experiments which don't need a full CI run,

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@allisonkarlitskaya @martinpitt